diff --git a/self-extractors_hikey960/root/BoardConfigVendor.mk b/self-extractors_hikey960/root/BoardConfigVendor.mk
index 1517386..e70a67d 100644
--- a/self-extractors_hikey960/root/BoardConfigVendor.mk
+++ b/self-extractors_hikey960/root/BoardConfigVendor.mk
@@ -12,6 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := hikey960/BoardConfigPartial.mk
-
--include vendor/linaro/$(LOCAL_STEM)
+-include vendor/linaro/hikey960/BoardConfigPartial.mk
diff --git a/self-extractors_hikey960/root/device-vendor.mk b/self-extractors_hikey960/root/device-vendor.mk
index 31f5c3a..f4fb1bb 100644
--- a/self-extractors_hikey960/root/device-vendor.mk
+++ b/self-extractors_hikey960/root/device-vendor.mk
@@ -14,6 +14,4 @@
 # limitations under the License.
 #
 
-LOCAL_STEM := device-partial.mk
-
-$(call inherit-product-if-exists, vendor/linaro/hikey960/hisilicon/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/linaro/hikey960/hisilicon/device-partial.mk)